Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Food Expansion 2 [DO NOT MERGE] #2461

Closed
wants to merge 75 commits into from
Closed

Food Expansion 2 [DO NOT MERGE] #2461

wants to merge 75 commits into from

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Nov 8, 2023 •
edited
Loading

About The Pull Request

Lore Food!

Finishing up Food Expansion #1813 !

Ports racial foods from TG and reflavors them to scrap a bit of the race stuff and replace it with our lore/factions

  • Make sure we ported everything we want
  • Make it all work and make sure you can obtain them all
  • Update the names and descriptions
  • Sort them into there right folders since they currently are in moth and lizard folders but alot of them wont have any relation to race after they have updated names and desc

Loredevs of all countries, unite!
https://hackmd.io/7-3btO7hTu-BS14ruc4T2w

Why It's Good For The Game

More foods - more fun

Changelog

🆑
add: Added a whole bunch of food with lore
tweak: tweaked some foodtypes
refactor: shifts around some of the folders like dividing pizzaspagetii.dmi to pizza.dmi and spagetii.dmi
/:cl:

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 8, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 8, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Nov 8, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 8, 2023
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Nov 8, 2023
@Valorium-RB
Copy link

This PR has been made with the official approval of the lore team, for the purposes of updated descriptions and whatnot.

@FalloutFalcon FalloutFalcon marked this pull request as ready for review November 27, 2023 04:53
@FalloutFalcon FalloutFalcon requested review from a team as code owners November 27, 2023 04:53
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 28, 2023
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Loafin34
Copy link

I must ask, is there poutine in this new update? If not, please add it immediately.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 15, 2023
@FalloutFalcon
Copy link
Member Author

FalloutFalcon commented Dec 15, 2023 •
edited
Loading

I must ask, is there poutine in this new update? If not, please add it immediately.

We already had poutine.
image
And i already added this
image

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jan 17, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jan 22, 2024
@thgvr
Copy link
Member

thgvr commented Feb 4, 2024

Still needs un-tgification

@FalloutFalcon
Copy link
Member Author

Still needs un-tgification

what does this mean..

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 5, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@FalloutFalcon FalloutFalcon changed the title Food Expansion 2 Food Expansion 2 [DO NOT MERGE] Feb 15, 2024
@keywordlabeler keywordlabeler bot added the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Feb 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkSuckerberg MarkSuckerberg Awaiting requested review from MarkSuckerberg MarkSuckerberg is a code owner

Assignees
No one assigned
Labels
Admin They do it for free. Code change Watch something violently break. DME Edit Do Not Merge You probably made someone angry, or you're stopping people from getting angry. Map Change Tile placing is hard. Thank you for your service. Merge Conflict Use Git Hooks, you're welcome. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@FalloutFalcon @Valorium-RB @thgvr @Loafin34 @MrSamu99